Skip to content

Merge recent development on devel into master#216

Merged
wanghan-iapcm merged 24 commits into
deepmodeling:masterfrom
amcadmus:master
Nov 14, 2021
Merged

Merge recent development on devel into master#216
wanghan-iapcm merged 24 commits into
deepmodeling:masterfrom
amcadmus:master

Conversation

@amcadmus

Copy link
Copy Markdown
Member

No description provided.

amcadmus and others added 24 commits July 7, 2021 07:29
* Update dump.py

* Create test_lammps_dump_unfold.py

* Create conf_unfold.dump

* Update dump.py

* Create conf_s_su.dump

* Create test_lammps_dump_s_su.py

* Update dump.py

* Update conf_unfold.dump

* Update dump.py
…#184)

* if cp2k output is not converged, return the sys len = 0

* modify the cp2k output code
1. use fp.seek(0) to avoid open file twice
2. add 'scf run' line in cp2k_output to read the output content, just to
   test the parser.

* add cp2k non converge output unittest

* add unittest for noncon output

* modify the unittest name
* add BondOrderSystem

* add BondOrderSystem

* add BondOrderSystem

* add BondOrderSystem

* add BondOrderSystem

* Update BondOrderSystem

* solve oveall dependency on rdkit

* Add dpdata/rdkit package

* Add information on functions

* Spelling correction

* Add bond order assignment

* Add test cases for bond order assignment

* Add support for AmberTools sqm/out

* Add bond order assignment

* Add support for AmberTools sqm/out

* Creat __init__.py

* Add rdkit & openbabel environment

* Update README.md

* Update test.yml

* Remove non user-friendly warnings

* Update dpdata/rdkit/sanitize.py

Co-authored-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>

* Use obabel python interface

* Update README.md

* Remove dependency on data for MolFormat & SdfFormat

* Support dump multiple conformers for sdf file

* Fix bug of  SetFormalCharge type error

RDKit cannot automatically transfer np.int32 to int

* Add ut for to_sdf_file

* Bug fix of dump to deepmd/raw file

Co-authored-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
* add .github/workflows/mirror_gitee.yml

* add env: ORGANIZATION in mirror_gitee.yml

* Update mirror_gitee.yml
* automatically generate API docs

* Update copyright

Co-authored-by: Han Wang <amcadmus@gmail.com>

Co-authored-by: Han Wang <amcadmus@gmail.com>
…eepmodeling#190)

* add MultiSystem for ASE traj(or any other format can be read by ASE)
fix bug(?) for ASE 'to_labeled_system'

* add unittest
add error type of exception
* add BondOrderSystem

* add BondOrderSystem

* add BondOrderSystem

* add BondOrderSystem

* add BondOrderSystem

* Update BondOrderSystem

* solve oveall dependency on rdkit

* Add dpdata/rdkit package

* Add information on functions

* Spelling correction

* Add bond order assignment

* Add test cases for bond order assignment

* Add support for AmberTools sqm/out

* Add bond order assignment

* Add support for AmberTools sqm/out

* Creat __init__.py

* Add rdkit & openbabel environment

* Update README.md

* Update test.yml

* Remove non user-friendly warnings

* Update dpdata/rdkit/sanitize.py

Co-authored-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>

* Use obabel python interface

* Update README.md

* Remove dependency on data for MolFormat & SdfFormat

* Support dump multiple conformers for sdf file

* Fix bug of  SetFormalCharge type error

RDKit cannot automatically transfer np.int32 to int

* Add ut for to_sdf_file

* Bug fix of dump to deepmd/raw file

* More flexibility to control writing to gro file

Support control resname / add atom index shift when dumping to .gro file

* Support parse sqm.out to LabeledSystem & prepare sqm.in file

Co-authored-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
* add deepmd/hdf5 format

To support deepmodeling/deepmd-kit#1163.

* bugfix

* add an example
* add .github/workflows/mirror_gitee.yml

* implement support for pymatgen.core.Molecule

* implement support for pymatgen.core.Molecule

* Change atom_types in dpdata/pymatgen/molecule.py

* Change doc string in dpdata/plugins/pymatgen.py

* add dpdata/pymatgin to setup.py

* modify molecule.py

* modify molecule.py

* modify molecule.py

* Support of pymatgen.Molecule in dpdata

* Update tests/test_pymatgen_molecule.py

* Moved "remove_pbc" from pymatgen/molecule.py to system.py
* add ABACUS MD interface.

* Update system.py

* Add files via upload
* add ABACUS MD interface.

* Update system.py

* Add files via upload

* Update md.py

* Update md.py
@codecov-commenter

codecov-commenter commented Nov 13, 2021

Copy link
Copy Markdown

Codecov Report

Attention: Patch coverage is 87.91391% with 73 lines in your changes missing coverage. Please review.

Project coverage is 82.05%. Comparing base (ea32d45) to head (f1859eb).
Report is 383 commits behind head on master.

Files with missing lines Patch % Lines
dpdata/system.py 44.73% 21 Missing ⚠️
dpdata/deepmd/hdf5.py 82.66% 13 Missing ⚠️
dpdata/unit.py 88.15% 9 Missing ⚠️
dpdata/plugins/ase.py 77.41% 7 Missing ⚠️
dpdata/abacus/md.py 96.50% 5 Missing ⚠️
dpdata/plugins/pymatgen.py 84.61% 4 Missing ⚠️
dpdata/lammps/dump.py 87.50% 3 Missing ⚠️
dpdata/plugins/deepmd.py 88.88% 3 Missing ⚠️
dpdata/rdkit/utils.py 57.14% 3 Missing ⚠️
dpdata/plugins/rdkit.py 66.66% 2 Missing ⚠️
... and 3 more
Additional details and impacted files
@@            Coverage Diff             @@
##           master     #216      +/-   ##
==========================================
+ Coverage   80.07%   82.05%   +1.97%     
==========================================
  Files          54       58       +4     
  Lines        4553     5027     +474     
==========================================
+ Hits         3646     4125     +479     
+ Misses        907      902       -5     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@wanghan-iapcm wanghan-iapcm merged commit 1d1084d into deepmodeling:master Nov 14, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.